bitkeeper revision 1.1159.258.123 (42852fd48Nr7wIoriw8GV3ZAjVOw8Q)

Many files:
  Create vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST) and
  vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST) symlinks in
  dist/install/boot from kernel build target.
install.sh:
  No need to create vmlinuz symlinks in dist/install/boot from install.sh
  anymore.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index 0a6df660006dcc6977de62e9912de0d0e8bcfb34..7a735b517d7a932e6d2928277d9d1640aa11cd00 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -32,7 +32,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
           ./mkbuildtree ../$(LINUX_DIR) )
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # add ebtables patch
        ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )

diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index 19808873858d7895d816df7f80b0aaeca674dc4a..256873e6fccd5e5a0f02f96e89c70b1afbf586d5 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
           ./mkbuildtree ../$(LINUX_DIR) )
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \

diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 997a2694dd40b1a357942d274b936ddaa40e0ce9..088330a657131c826e79aee5915ae933a39eb751 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
           ./mkbuildtree ../$(LINUX_DIR) )
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \

diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index 1a095ed53d6922f523ab785c06753ac7be2abe91..7b2c7e291efcb0951b55f6a5de3dd230b21e5f6a 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -27,7 +27,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
           ./mkbuildtree ../$(LINUX_DIR) )
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         sed -e 's/^EXTRAVERSION.*/&-$$(XENGUEST)\nXENGUEST = $(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \

diff --git a/install.sh b/install.sh
index a8ab96134c0bb987b3909f3a83822bf09ae85831..7da84dafad17d40fb5c18df78e4c3bf83739b830 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -23,15 +23,6 @@ if ! [ -d $dst ]; then
 fi
 
 echo "Installing Xen from '$src' to '$dst'..."
-cd $src/boot
-(echo '2.6.*' -2.6; echo '2.4.*' -2.4; echo '2.*.*' '') | while read m v
-do
-  l=$(eval ls -t vmlinuz-$m-xen0 2>/dev/null | head -n 1)
-  [ -e "$l" ] && ln -fs "$l" vmlinuz${v}-xen0
-  l=$(eval ls -t vmlinuz-$m-xenU 2>/dev/null | head -n 1)
-  [ -e "$l" ] && ln -fs "$l" vmlinuz${v}-xenU
-done
-cd -
 cp -fdRL $src/* $dst
 echo "All done."
 

diff --git a/linux-2.4.29-xen-sparse/arch/xen/Makefile b/linux-2.4.29-xen-sparse/arch/xen/Makefile
index 0f1d0580da45ac9d34ae3f30fd652c755b924dde..c8cf8cd6e8bfbe12e5cac76a12ea710296229371 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.29-xen-sparse/arch/xen/Makefile
@@ -113,10 +113,13 @@ bzImage: vmlinux
 INSTALL_NAME ?= $(KERNELRELEASE)
 install: bzImage
        mkdir -p $(INSTALL_PATH)/boot
+       ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
+       rm -f $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 arch/$(ARCH)/boot/bzImage $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(INSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(INSTALL_NAME)$(INSTALL_SUFFIX)
+       ln -f -s vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
 
 %_config: arch/xen/defconfig-%
        rm -f .config arch/xen/defconfig

diff --git a/linux-2.6.11-xen-sparse/arch/xen/Makefile b/linux-2.6.11-xen-sparse/arch/xen/Makefile
index 86132ecf16aef8f52108f48ed3b286ecfee4766d..c67ff0c3d62b5562a68986b1f3497b609fd18ec6 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/Makefile
+++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile
@@ -48,10 +48,13 @@ vmlinuz: vmlinux
 XINSTALL_NAME ?= $(KERNELRELEASE)
 install: vmlinuz
        mkdir -p $(INSTALL_PATH)/boot
+       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
+       rm -f $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 .config $(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
        install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+       ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-$(XENGUEST)$(INSTALL_SUFFIX)
        mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
        install -m0644 include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux